From d69f657aecdd474fc399cfe7b58f3e160ceef301 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Sun, 23 Oct 2016 12:38:31 +0200 Subject: [PATCH] layout: Remove deprecated API --- docs/reference/gtk/gtk4-sections.txt | 4 -- gtk/gtklayout.c | 99 ++-------------------------- gtk/gtklayout.h | 12 ---- 3 files changed, 6 insertions(+), 109 deletions(-) diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index adb40321fa..02c9eeef60 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -1858,10 +1858,6 @@ gtk_layout_put gtk_layout_move gtk_layout_set_size gtk_layout_get_size -gtk_layout_get_hadjustment -gtk_layout_get_vadjustment -gtk_layout_set_hadjustment -gtk_layout_set_vadjustment gtk_layout_get_bin_window GTK_LAYOUT diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c index 56347b205f..d43e9c0c9f 100644 --- a/gtk/gtklayout.c +++ b/gtk/gtklayout.c @@ -210,51 +210,6 @@ gtk_layout_get_bin_window (GtkLayout *layout) return layout->priv->bin_window; } -/** - * gtk_layout_get_hadjustment: - * @layout: a #GtkLayout - * - * This function should only be called after the layout has been - * placed in a #GtkScrolledWindow or otherwise configured for - * scrolling. It returns the #GtkAdjustment used for communication - * between the horizontal scrollbar and @layout. - * - * See #GtkScrolledWindow, #GtkScrollbar, #GtkAdjustment for details. - * - * Returns: (transfer none): horizontal scroll adjustment - * - * Deprecated: 3.0: Use gtk_scrollable_get_hadjustment() - **/ -GtkAdjustment* -gtk_layout_get_hadjustment (GtkLayout *layout) -{ - g_return_val_if_fail (GTK_IS_LAYOUT (layout), NULL); - - return layout->priv->hadjustment; -} -/** - * gtk_layout_get_vadjustment: - * @layout: a #GtkLayout - * - * This function should only be called after the layout has been - * placed in a #GtkScrolledWindow or otherwise configured for - * scrolling. It returns the #GtkAdjustment used for communication - * between the vertical scrollbar and @layout. - * - * See #GtkScrolledWindow, #GtkScrollbar, #GtkAdjustment for details. - * - * Returns: (transfer none): vertical scroll adjustment - * - * Deprecated: 3.0: Use gtk_scrollable_get_vadjustment() - **/ -GtkAdjustment* -gtk_layout_get_vadjustment (GtkLayout *layout) -{ - g_return_val_if_fail (GTK_IS_LAYOUT (layout), NULL); - - return layout->priv->vadjustment; -} - static void gtk_layout_set_hadjustment_values (GtkLayout *layout) { @@ -323,8 +278,8 @@ gtk_layout_finalize (GObject *object) } static void -gtk_layout_do_set_hadjustment (GtkLayout *layout, - GtkAdjustment *adjustment) +gtk_layout_set_hadjustment (GtkLayout *layout, + GtkAdjustment *adjustment) { GtkLayoutPrivate *priv; @@ -352,30 +307,9 @@ gtk_layout_do_set_hadjustment (GtkLayout *layout, g_object_notify (G_OBJECT (layout), "hadjustment"); } -/** - * gtk_layout_set_hadjustment: - * @layout: a #GtkLayout - * @adjustment: (allow-none): new scroll adjustment - * - * Sets the horizontal scroll adjustment for the layout. - * - * See #GtkScrolledWindow, #GtkScrollbar, #GtkAdjustment for details. - * - * Deprecated: 3.0: Use gtk_scrollable_set_hadjustment() - **/ -void -gtk_layout_set_hadjustment (GtkLayout *layout, - GtkAdjustment *adjustment) -{ - g_return_if_fail (GTK_IS_LAYOUT (layout)); - g_return_if_fail (adjustment == NULL || GTK_IS_ADJUSTMENT (adjustment)); - - gtk_layout_do_set_hadjustment (layout, adjustment); -} - static void -gtk_layout_do_set_vadjustment (GtkLayout *layout, - GtkAdjustment *adjustment) +gtk_layout_set_vadjustment (GtkLayout *layout, + GtkAdjustment *adjustment) { GtkLayoutPrivate *priv; @@ -403,27 +337,6 @@ gtk_layout_do_set_vadjustment (GtkLayout *layout, g_object_notify (G_OBJECT (layout), "vadjustment"); } -/** - * gtk_layout_set_vadjustment: - * @layout: a #GtkLayout - * @adjustment: (allow-none): new scroll adjustment - * - * Sets the vertical scroll adjustment for the layout. - * - * See #GtkScrolledWindow, #GtkScrollbar, #GtkAdjustment for details. - * - * Deprecated: 3.0: Use gtk_scrollable_set_vadjustment() - **/ -void -gtk_layout_set_vadjustment (GtkLayout *layout, - GtkAdjustment *adjustment) -{ - g_return_if_fail (GTK_IS_LAYOUT (layout)); - g_return_if_fail (adjustment == NULL || GTK_IS_ADJUSTMENT (adjustment)); - - gtk_layout_do_set_vadjustment (layout, adjustment); -} - static GtkLayoutChild* get_child (GtkLayout *layout, GtkWidget *widget) @@ -744,10 +657,10 @@ gtk_layout_set_property (GObject *object, switch (prop_id) { case PROP_HADJUSTMENT: - gtk_layout_do_set_hadjustment (layout, g_value_get_object (value)); + gtk_layout_set_hadjustment (layout, g_value_get_object (value)); break; case PROP_VADJUSTMENT: - gtk_layout_do_set_vadjustment (layout, g_value_get_object (value)); + gtk_layout_set_vadjustment (layout, g_value_get_object (value)); break; case PROP_HSCROLL_POLICY: if (priv->hscroll_policy != g_value_get_enum (value)) diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h index 921084d314..e764ffcdfc 100644 --- a/gtk/gtklayout.h +++ b/gtk/gtklayout.h @@ -98,18 +98,6 @@ void gtk_layout_get_size (GtkLayout *layout, guint *width, guint *height); -GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_hadjustment) -GtkAdjustment* gtk_layout_get_hadjustment (GtkLayout *layout); -GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_vadjustment) -GtkAdjustment* gtk_layout_get_vadjustment (GtkLayout *layout); -GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_set_hadjustment) -void gtk_layout_set_hadjustment (GtkLayout *layout, - GtkAdjustment *adjustment); -GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_set_vadjustment) -void gtk_layout_set_vadjustment (GtkLayout *layout, - GtkAdjustment *adjustment); - - G_END_DECLS #endif /* __GTK_LAYOUT_H__ */ -- 2.30.2